Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused zapx replace statement on go.mod #24515

Merged
merged 2 commits into from
May 4, 2023
Merged

Remove unused zapx replace statement on go.mod #24515

merged 2 commits into from
May 4, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented May 4, 2023

Fix #23617

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 4, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 4, 2023
wolfogre
wolfogre approved these changes May 4, 2023
View reviewed changes
Copy link
Member

@wolfogre wolfogre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, the removed replace has no effect now, it's for v15.3.6. Since github.com/blevesearch/zapx/v15 already has been updated to v15.3.9, I think #23062 should already fixed #23617.

LGTM to remove useless replace.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 4, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 4, 2023
@yardenshoham yardenshoham added dependencies skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels May 4, 2023
@lunny lunny changed the title Use official zapx package Remove unused zapx replace statement on go.mod May 4, 2023
@delvh delvh mentioned this pull request May 4, 2023
Merged
@silverwind silverwind merged commit 55a5717 into go-gitea:main May 4, 2023
@GiteaBot GiteaBot added this to the 1.20.0 milestone May 4, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 4, 2023
KN4CK3R pushed a commit that referenced this pull request May 4, 2023
@lunny @xen0n @zeripath
Bump go.etcd.io/bbolt and blevesearch deps (#23062) (#24519)
f979569 
Backport #23062
Backport #24515
Fix #23617 

This notably brings support for GOARCH=loong64, among other fixes.
This PR also fix bleve search architecture problem.

---------

Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
Co-authored-by: WÁNG Xuěruì <1175567+xen0n@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
@lunny lunny deleted the lunny/update_zapx branch May 4, 2023 10:47
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 5, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
43987ed 
* upstream/main:
  Harmonize title formatting in `docs/content/doc/development/api-usage.en-us.md` (go-gitea#24529)
  automate locking closed threads (go-gitea#24525)
  [skip ci] Updated translations via Crowdin
  Display warning when user try to rename default branch (go-gitea#24512)
  Upgrade to Node 20 on CI, enable actions cancellation (go-gitea#24524)
  Fix incorrectly quoted translation (go-gitea#24514)
  Fix color for transfer related buttons when having no permission to act (go-gitea#24510)
  Fix some mistakes when using `ignSignIn` (go-gitea#24415)
  Remove unused zapx replace statement on go.mod (go-gitea#24515)
  Don't display creating page button in a mirror wiki repository (go-gitea#24395)
  Improve template system and panic recovery (go-gitea#24461)
  Faster git.GetDivergingCommits (go-gitea#24482)
  Merge setting.InitXXX into one function with options (go-gitea#24389)
@wxiaoguang wxiaoguang mentioned this pull request May 27, 2023
Closed
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wolfogre wolfogre wolfogre approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.

zapx: Code indexer crashes gitea on i386/x86 with "panic: unaligned 64-bit atomic operation"
6 participants
@lunny @wolfogre @delvh @silverwind @yardenshoham @GiteaBot